debian/rules: Explicitly supply VDB_LIBDIR to configure

... to avoid a bad interaction that led to spurious runpath entries in
binaries linked against VDB.

diff --git a/debian/changelog b/debian/changelog
index 7758b21d8a3d3125451c19befff49607d8aabbbc..07232a495c51be5a998a21d96248b280972038b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,11 @@ ncbi-blast+ (2.17.0+ds-1) UNRELEASED; urgency=medium
     and fix_bm_for_gcc15, all incorporated upstream.
   * debian/patches/system_mbedtls_only: Drop code changes (incorporated
     upstream) and port Makefile.connssl.lib's changes.
+  * debian/rules: Explicitly supply VDB_LIBDIR to configure to avoid a bad
+    interaction that led to spurious runpath entries in binaries linked
+    against VDB.
 
- -- Aaron M. Ucko <ucko@debian.org>  Sat, 27 Sep 2025 21:19:21 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Sat, 27 Sep 2025 22:23:32 -0400
 
 ncbi-blast+ (2.16.0+ds-7) unstable; urgency=medium
 

diff --git a/debian/rules b/debian/rules
index e5203511150378e76c0ab69b3bc8bcb89e6cdeaa..9772208113e78796b55e441ced1b27af342ed606 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,8 @@ ifneq (,$(filter amd64 arm64 x32,$(DEB_HOST_ARCH)))
  VDB_SUBTREES=os/$(DEB_HOST_ARCH_OS) os/unix cc/gcc/$(DEB_HOST_GNU_CPU) cc/gcc
  VDB_INC=-I/usr/include/ncbi-vdb
  VDB_INCLUDE=$(VDB_INC) $(VDB_SUBTREES:%=$(VDB_INC)/%)
- DEB_CONFIGURE_COMMON_FLAGS += --with-vdb=/usr VDB_INCLUDE="$(VDB_INCLUDE)"
+ DEB_CONFIGURE_COMMON_FLAGS += --with-vdb=/usr VDB_INCLUDE="$(VDB_INCLUDE)" \
+                               VDB_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 else
  DEB_CONFIGURE_COMMON_FLAGS += --without-downloaded-vdb
 endif